Skip to content

[Backport release-24.11] microsoft-edge: 137.0.3296.83 -> 137.0.3296.93#419351

Merged
isabelroses merged 1 commit intoNixOS:release-24.11from
Bricklou:backport-419268-to-release-24.11
Jun 23, 2025
Merged

[Backport release-24.11] microsoft-edge: 137.0.3296.83 -> 137.0.3296.93#419351
isabelroses merged 1 commit intoNixOS:release-24.11from
Bricklou:backport-419268-to-release-24.11

Conversation

@Bricklou
Copy link
Contributor

(cherry picked from commit 75d0c24)

Backport to release-24.11 of #419268.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Jun 23, 2025
github-actions[bot]

This comment was marked as resolved.

@mweinelt mweinelt requested a review from ulrikstrid June 23, 2025 19:36
@github-actions github-actions bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 4.workflow: backport This targets a stable branch labels Jun 23, 2025
@nix-owners nix-owners bot requested review from Daholli and maeve-oake June 23, 2025 19:37
@Bricklou Bricklou force-pushed the backport-419268-to-release-24.11 branch from 09996b0 to f1b15b3 Compare June 23, 2025 19:39
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 23, 2025
@Bricklou Bricklou force-pushed the backport-419268-to-release-24.11 branch from f1b15b3 to d84f805 Compare June 23, 2025 19:43
@emilylange emilylange added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jun 23, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 23, 2025
@Bricklou
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 419351
Commit: d84f805e7952d4a0bc64b142b12343016486d967


x86_64-linux

✅ 1 package built:
  • microsoft-edge

@isabelroses isabelroses merged commit 2e4f7e7 into NixOS:release-24.11 Jun 23, 2025
26 of 28 checks passed
@Bricklou Bricklou deleted the backport-419268-to-release-24.11 branch June 23, 2025 20:18
@emilylange
Copy link
Member

emilylange commented Jun 23, 2025

Re: review dismiss in #419351 (comment)

No, this is not how this works.

 @@ pkgs/by-name/mi/microsoft-edge/package.nix: in
  
- stdenvNoCC.mkDerivation (finalAttrs: {
+ stdenv.mkDerivation (finalAttrs: {
    pname = "microsoft-edge";
--  version = "137.0.3296.83";
+-  version = "137.0.3296.68";
 +  version = "137.0.3296.93";
  
    src = fetchurl {
      url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
--    hash = "sha256-wbiijvxzyyM9lxoMtcQHFqZYChlsHh0hNQTwdgxPpZY=";
+-    hash = "sha256-dgmQF6zpd8dAYKoTSiidk8VU6dZ/ZWEDlYD91IPaDEE=";
 +    hash = "sha256-SC8h6UQ/ee5ZlQWAZsmC1Co5Ky4kaXuoMpvVZtTIMHQ=";
    };

This cherry-pick did not apply cleanly, when it could have, because this is not a bump from 137.0.3296.83 to 137.0.3296.93 as the PR title and commit message suggest. It is a bump from 137.0.3296.68. This is why the CI check was failing. Rightfully so. You should not have dismissed it.

To quote the dismissed cherry-pick review:

Occasionally, it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts while cherry-picking or when updating minor versions of packages which have already advanced to the next major on unstable.

#417925 should have been backported first. This is why there was a merge-conflict to begin with.

Note that this would not have required multiple PRs. Cherry-picking multiple PRs in a single PR is perfectly fine, as long as it is communicated properly.

@Bricklou
Copy link
Contributor Author

Sorry! I'm very new to this, I tried my best. 😅
I'll remember for the next time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants